Skip to content

Always merge project files before external JARs (fixes #513)#571

Merged
eed3si9n merged 3 commits into
sbt:developfrom
piotrp:ci-windows-sbt2
May 5, 2026
Merged

Always merge project files before external JARs (fixes #513)#571
eed3si9n merged 3 commits into
sbt:developfrom
piotrp:ci-windows-sbt2

Conversation

@piotrp
Copy link
Copy Markdown

@piotrp piotrp commented May 3, 2026

A fix for #513, comprised of three separate changes:

  • enabled Windows tests for sbt 2
  • the main fix - incorrect paths (with \ instead of /) were masked by PathList.unapplySeq, but still passed to JarJar
  • a change to make project/JAR ordering independent from exportJars - scripted tests in merging/merging were run with explicit exportJars = true, but Windows paths were incorrectly processed only when exportJars = false - I wanted to reuse this test, especially that merge order of project files and external JAR dependencies wasn't tested

piotrp added 2 commits May 3, 2026 15:38
JAR entries are always read using forward slashes, while project files on Windows use backslashes
@piotrp piotrp force-pushed the ci-windows-sbt2 branch from 97adcee to 93240f0 Compare May 3, 2026 23:09
Previously order depended on exportJars flag:
* false (default) - project files were ordered before external JAR dependencies
* true - project files were packaged in JAR and ordered like an external dependency
@piotrp piotrp force-pushed the ci-windows-sbt2 branch from 93240f0 to a7bd6e5 Compare May 4, 2026 06:29
Copy link
Copy Markdown
Member

@eed3si9n eed3si9n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@eed3si9n eed3si9n merged commit 3da5147 into sbt:develop May 5, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants